auto merge of #536 : superlogical/cargo/master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 9 Sep 2014 15:13:47 +0000 (15:13 +0000)
committerbors <bors@rust-lang.org>
Tue, 9 Sep 2014 15:13:47 +0000 (15:13 +0000)
So that it compiles and works


Trivial merge